diff --git a/polymer/build/include/build.h b/polymer/build/include/build.h
index f938253c1..0361b2b5b 100644
--- a/polymer/build/include/build.h
+++ b/polymer/build/include/build.h
@@ -151,7 +151,7 @@ typedef struct BPACK {
     short mdanimcur;
     short angoff;
     short pitch, roll;
-    short xoff, yoff, zoff;
+    long xoff, yoff, zoff;
     unsigned char flags;
     char filler[3];
 } spriteexttype;
diff --git a/polymer/build/src/engine.c b/polymer/build/src/engine.c
index e7cb17399..3f1a9de69 100644
--- a/polymer/build/src/engine.c
+++ b/polymer/build/src/engine.c
@@ -4627,6 +4627,7 @@ if (dastat&16) { xoff = 0; yoff = 0; }
     setgotpic(picnum);
     bufplc = waloff[picnum];
 
+    if(!palookup[dapalnum]) dapalnum = 0;
     palookupoffs = FP_OFF(palookup[dapalnum]) + (getpalookup(0L,(long)dashade)<<8);
 
     i = divscale32(1L,z);
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 513331dee..b838eb2b9 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -1523,9 +1523,9 @@ void Keys3d(void)
         }
 
         if (tabgraphic == 1 )
-            rotatesprite((44)<<16,(114)<<16,32768,0,temppicnum,tempshade,temppal,2,0L,0L,xdim-1L,ydim-1L);
+            rotatesprite((44+tilesizx[temppicnum])<<16,(114)<<16,32768,0,temppicnum,tempshade,temppal,2,0L,0L,xdim-1L,ydim-1L);
         else if (tabgraphic == 2 )
-            rotatesprite((44)<<16,(114)<<16,16384,0,temppicnum,tempshade,temppal,2,0L,0L,xdim-1L,ydim-1L);
+            rotatesprite((44+tilesizx[temppicnum])<<16,(114)<<16,16384,0,temppicnum,tempshade,temppal,2,0L,0L,xdim-1L,ydim-1L);
 
         begindrawing();
         j = xdimgame>640?0:1;
diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index 55c5dc277..824571bc5 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -62,7 +62,7 @@ extern int conversion, shareware, gametype;
 #define BYTEVERSION_13  27
 #define BYTEVERSION_14  116
 #define BYTEVERSION_15  117
-#define BYTEVERSION_JF  168 // increase by 3, because atomic GRP adds 1, and Shareware adds 2
+#define BYTEVERSION_JF  171 // increase by 3, because atomic GRP adds 1, and Shareware adds 2
 
 #define BYTEVERSION (BYTEVERSION_JF+(PLUTOPAK?1:(VOLUMEONE<<1)))    // JBF 20040116: different data files give different versions