diff --git a/core/cmd/mkenrolment/main.go b/core/cmd/mkenrolment/main.go
index a3254e0..8b29489 100644
--- a/core/cmd/mkenrolment/main.go
+++ b/core/cmd/mkenrolment/main.go
@@ -21,9 +21,10 @@
 	"io/ioutil"
 	"os"
 
-	"git.monogon.dev/source/nexantic.git/core/generated/api"
 	"github.com/gogo/protobuf/proto"
 	"google.golang.org/grpc"
+
+	"git.monogon.dev/source/nexantic.git/core/generated/api"
 )
 
 func main() {
diff --git a/core/cmd/mkimage/main.go b/core/cmd/mkimage/main.go
index 0803c80..ddf8813 100644
--- a/core/cmd/mkimage/main.go
+++ b/core/cmd/mkimage/main.go
@@ -22,7 +22,7 @@
 	"io/ioutil"
 	"os"
 
-	"github.com/diskfs/go-diskfs"
+	diskfs "github.com/diskfs/go-diskfs"
 	"github.com/diskfs/go-diskfs/disk"
 	"github.com/diskfs/go-diskfs/filesystem"
 	"github.com/diskfs/go-diskfs/partition/gpt"