diff --git a/src/kernel/core/disk_device_manager/KDiskDevice.cpp b/src/kernel/core/disk_device_manager/KDiskDevice.cpp
index ab447b80d7..977ece65cd 100644
--- a/src/kernel/core/disk_device_manager/KDiskDevice.cpp
+++ b/src/kernel/core/disk_device_manager/KDiskDevice.cpp
@@ -336,7 +336,7 @@ KDiskDevice::ShadowOwner() const
 void
 KDiskDevice::WriteUserData(UserDataWriter &writer, bool shadow)
 {
-	KPartition *partition = (shadow ? ShadowPartition() : this);
+	KPartition *partition = shadow ? ShadowPartition() : static_cast<KPartition *>(this);
 	if (!partition)
 		partition = this;
 	user_disk_device_data *data
diff --git a/src/kernel/core/disk_device_manager/UserDataWriter.cpp b/src/kernel/core/disk_device_manager/UserDataWriter.cpp
index 7e8d4f700e..9dd757ea45 100644
--- a/src/kernel/core/disk_device_manager/UserDataWriter.cpp
+++ b/src/kernel/core/disk_device_manager/UserDataWriter.cpp
@@ -68,7 +68,7 @@ UserDataWriter::Unset()
 
 // AllocateData
 void *
-UserDataWriter::AllocateData(size_t size, size_t align = 1)
+UserDataWriter::AllocateData(size_t size, size_t align)
 {
 	// handles size == 0 gracefully
 	// get a properly aligned offset