diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb1eab35ac..d05683e2ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -361,19 +361,19 @@ if( NOT NO_ASM )
 			set( ASM_FLAGS -f win32 -DWIN32 -i${CMAKE_CURRENT_SOURCE_DIR}/ )
 		endif( X64 )
 	endif( UNIX )
-	if( WIN32 )
+	if( WIN32 AND NOT X64 )
 		set( FIXRTEXT fixrtext )
-	else( WIN32 )
+	else( WIN32 AND NOT X64 )
 		set( FIXRTEXT "" )
-	endif( WIN32 )
+	endif( WIN32 AND NOT X64 )
 	message( STATUS "Selected assembler: ${ASSEMBLER}" )
 	MACRO( ADD_ASM_FILE indir infile )
 		set( ASM_OUTPUT_${infile} "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/zdoom.dir/${indir}/${infile}${ASM_OUTPUT_EXTENSION}" )
-		if( WIN32 )
+		if( WIN32 AND NOT X64 )
 			set( FIXRTEXT_${infile} COMMAND ${FIXRTEXT} "${ASM_OUTPUT_${infile}}" )
-		else( WIN32 )
+		else( WIN32 AND NOT X64 )
 			set( FIXRTEXT_${infile} COMMAND "" )
-		endif( WIN32 )
+		endif( WIN32 AND NOT X64 )
 		add_custom_command( OUTPUT ${ASM_OUTPUT_${infile}}
 			COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/zdoom.dir/${indir}
 			COMMAND ${ASSEMBLER} ${ASM_FLAGS} -o"${ASM_OUTPUT_${infile}}" "${CMAKE_CURRENT_SOURCE_DIR}/${indir}/${infile}${ASM_SOURCE_EXTENSION}"
diff --git a/src/p_map.cpp b/src/p_map.cpp
index 066805d3f2..b406dff7bd 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -736,11 +736,9 @@ bool PIT_CheckLine(line_t *ld, const FBoundingBox &box, FCheckPosition &tm)
 	else
 	{ // Find the point on the line closest to the actor's center, and use
 		// that to calculate openings
-		float dx = (float)ld->dx;
-		float dy = (float)ld->dy;
-		fixed_t r = (fixed_t)(((float)(tm.x - ld->v1->x) * dx +
-			(float)(tm.y - ld->v1->y) * dy) /
-			(dx*dx + dy*dy) * 16777216.f);
+		SQWORD r_den = (SQWORD(ld->dx)*ld->dx + SQWORD(ld->dy)*ld->dy) / (1 << 24);
+		SQWORD r_num = ((SQWORD(tm.x - ld->v1->x)*ld->dx) + (SQWORD(tm.y - ld->v1->y)*ld->dy));
+		fixed_t r = (fixed_t)(r_num / r_den);
 		/*		Printf ("%d:%d: %d  (%d %d %d %d)  (%d %d %d %d)\n", level.time, ld-lines, r,
 		ld->frontsector->floorplane.a,
 		ld->frontsector->floorplane.b,
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 08a1c4f4b4..4f9e9ae220 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required( VERSION 2.4 )
 
 add_subdirectory( lemon )
 add_subdirectory( re2c )
-if( WIN32 )
+if( WIN32 AND NOT CMAKE_SIZEOF_VOID_P MATCHES "8" )
 	add_subdirectory( fixrtext )
-endif( WIN32 )
+endif( WIN32 AND NOT CMAKE_SIZEOF_VOID_P MATCHES "8" )
 add_subdirectory( updaterevision )
 add_subdirectory( zipdir )