diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index 43d5117915..9a784b04ac 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -110,6 +110,7 @@ SYSTEM_ADD_ONS_DRIVERS_BT_H2 +=
 ;
 
 SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
+	ati.accelerant
 	x86,x86_64 @{
 		intel_810.accelerant intel_extreme.accelerant
 		matrox.accelerant
@@ -118,7 +119,7 @@ SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
 		via.accelerant
 	}@ # x86,x86_64
 	x86 @{
-		3dfx.accelerant ati.accelerant neomagic.accelerant s3.accelerant
+		3dfx.accelerant neomagic.accelerant s3.accelerant
 	}@ # x86
 ] ;
 
diff --git a/src/add-ons/accelerants/ati/mach64_overlay.cpp b/src/add-ons/accelerants/ati/mach64_overlay.cpp
index dedbaacf01..b9a856ae83 100644
--- a/src/add-ons/accelerants/ati/mach64_overlay.cpp
+++ b/src/add-ons/accelerants/ati/mach64_overlay.cpp
@@ -122,8 +122,8 @@ Mach64_DisplayOverlay(const overlay_window* window,
 	OUTREG(VIDEO_FORMAT, videoFormat);
 
 	// Compute offset of overlay buffer in the video memory.
-	uint32 offset = uint32(buffer->buffer) - si.videoMemAddr;
-	
+	uint32 offset = (uint32)((addr_t)buffer->buffer - si.videoMemAddr);
+
 	if (si.chipType < MACH64_264VTB) {
 		OUTREG(BUF0_OFFSET, offset);
 		OUTREG(BUF0_PITCH, buffer->width);
diff --git a/src/add-ons/accelerants/ati/overlay.cpp b/src/add-ons/accelerants/ati/overlay.cpp
index 4d45e1d6e3..6094d03fd1 100644
--- a/src/add-ons/accelerants/ati/overlay.cpp
+++ b/src/add-ons/accelerants/ati/overlay.cpp
@@ -264,7 +264,7 @@ ReleaseOverlay(overlay_token overlayToken)
 {
 	SharedInfo& si = *gInfo.sharedInfo;
 
-	if (overlayToken != (overlay_token)si.overlayToken) {
+	if (overlayToken != (overlay_token)(addr_t)si.overlayToken) {
 		TRACE("ReleaseOverlay() error - no overlay previously allocated\n");
 		return B_BAD_VALUE;
 	}
@@ -285,7 +285,7 @@ ConfigureOverlay(overlay_token overlayToken, const overlay_buffer* buffer,
 {
 	SharedInfo& si = *gInfo.sharedInfo;
 
-	if (overlayToken != (overlay_token)si.overlayToken)
+	if (overlayToken != (overlay_token)(addr_t)si.overlayToken)
 		return B_BAD_VALUE;
 
 	if (buffer == NULL)
diff --git a/src/add-ons/accelerants/ati/rage128_overlay.cpp b/src/add-ons/accelerants/ati/rage128_overlay.cpp
index 727fa961fb..d59f50cf11 100644
--- a/src/add-ons/accelerants/ati/rage128_overlay.cpp
+++ b/src/add-ons/accelerants/ati/rage128_overlay.cpp
@@ -131,7 +131,7 @@ Rage128_DisplayOverlay(const overlay_window* window,
 	int32 p1_v_accum_init = ((tmp << 4) & 0x03ff8000) | 0x00000001;
 
 	// Compute offset of overlay buffer in the video memory.
-	uint32 offset = uint32(buffer->buffer) - si.videoMemAddr;
+	uint32 offset = (uint32)((addr_t)buffer->buffer - si.videoMemAddr);
 
 	OUTREG(R128_OV0_REG_LOAD_CNTL, 1);
 	while (!(INREG(R128_OV0_REG_LOAD_CNTL) & (1 << 3)))