1 files changed, 3 insertions, 3 deletions

diff --git a/mps/code/amcss.c b/mps/code/amcss.c
index 7055bf94b70..b1a0d5e4e6b 100644
--- a/mps/code/amcss.c
+++ b/mps/code/amcss.c
@@ -38,7 +38,7 @@ static mps_gen_param_s testChain[genCOUNT] = {
 
 
 /* objNULL needs to be odd so that it's ignored in exactRoots. */
-#define objNULL           ((mps_addr_t)0xDECEA5ED)
+#define objNULL           ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
 
 
 static mps_pool_t pool;
@@ -210,7 +210,7 @@ static void *test(void *arg, size_t s)
   ramping = 1;
   objs = 0;
   while (collections < collectionsCOUNT) {
-    unsigned long c;
+    mps_word_t c;
     size_t r;
 
     c = mps_collections(arena);
@@ -221,7 +221,7 @@ static void *test(void *arg, size_t s)
       printf("%lu objects (mps_collections says: %lu)\n", objs, c);
 
       /* test mps_arena_has_addr */
-      {
+      if (sizeof(mps_addr_t) == 4) { /* @@@@ W3I6MV This test is bogus for 64-bit address space. */
         size_t hitRatio;
         int hitsWanted = 4;  /* aim for 4 hits (on average) */
         /* [Note: The for-loop condition used to be "i < 4 * hitRatio",