diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 916a64cfeb..4cba5bb055 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -306,7 +306,7 @@ HAIKU_EXECUTABLE_BEGIN_GLUE_CODE =
 ;
 HAIKU_EXECUTABLE_END_GLUE_CODE = $(HAIKU_LIBRARY_END_GLUE_CODE) ;
 HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = crtbegin.o ;
-HAIKU_KERNEL_ADDON_END_GLUE_CODE = crtend.o ;
+HAIKU_KERNEL_ADDON_END_GLUE_CODE = $(HAIKU_GCC_LIBGCC) crtend.o ;
 
 SEARCH on crtbegin.o crtend.o = $(HAIKU_GCC_LIB_DIR) ;
 
@@ -747,7 +747,7 @@ if $(TARGET_PLATFORM) = libbe_test {
 
 # common stuff
 
-# start with a clean slate
+# start with a clean state
 CCFLAGS = ;
 C++FLAGS = ;
 DEFINES = ;
diff --git a/src/add-ons/kernel/partitioning_systems/intel/intel.cpp b/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
index 82958d3b41..87830b7f29 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
@@ -1542,7 +1542,7 @@ move_partition(int fd, off_t fromOffset, off_t toOffset, off_t size,
 			return error;
 		fromOffset += buffer_size;
 		toOffset += buffer_size;
-		update_disk_device_job_progress(job, i * 1.0 / cycleCount);
+		update_disk_device_job_progress(job, (float)i / cycleCount);
 	}
 	if (remainingSize)
 		error = move_block(fd, fromOffset, toOffset, buffer, remainingSize);