diff --git a/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java b/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
index 33e0be384..14034edd8 100644
--- a/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
@@ -68,7 +68,7 @@ import org.apache.poi.hssf.util.RangeAddress;
 
 public class Area3DPtg extends Ptg
 {
-    public final static short sid  = 0x3b;
+    public final static byte sid  = 0x3b;
     private final static int  SIZE = 11; // 10 + 1 for Ptg
     private short             field_1_index_extern_sheet;
     private short             field_2_first_row;
diff --git a/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java b/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
index a741192b8..ce0ef78b5 100644
--- a/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
@@ -75,7 +75,7 @@ import java.util.List;
 public class AttrPtg
     extends OperationPtg
 {
-    public final static short sid  = 0x19;
+    public final static byte sid  = 0x19;
     private final static int  SIZE = 4;
     private byte              field_1_options;
     private short             field_2_data;
diff --git a/src/java/org/apache/poi/hssf/record/formula/FuncPtg.java b/src/java/org/apache/poi/hssf/record/formula/FuncPtg.java
index ad573d836..73729fb36 100644
--- a/src/java/org/apache/poi/hssf/record/formula/FuncPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/FuncPtg.java
@@ -3,7 +3,7 @@ import org.apache.poi.util.LittleEndian;
 
 public class FuncPtg extends AbstractFunctionPtg{
     
-    public final static short sid  = 0x21;
+    public final static byte sid  = 0x21;
     private int numParams=0;
     /**Creates new function pointer from a byte array 
      * usually called while reading an excel file. 
@@ -20,7 +20,7 @@ public class FuncPtg extends AbstractFunctionPtg{
     }
     
      public void writeBytes(byte[] array, int offset) {
-        array[offset+0]=(byte) (sid + ptgClass);
+        array[offset+0]= (byte) (sid + ptgClass);
         //array[offset+1]=field_1_num_args;
         LittleEndian.putShort(array,offset+1,field_2_fnc_index);
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/FuncVarPtg.java b/src/java/org/apache/poi/hssf/record/formula/FuncVarPtg.java
index fff93a5db..9faf5ac07 100644
--- a/src/java/org/apache/poi/hssf/record/formula/FuncVarPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/FuncVarPtg.java
@@ -2,7 +2,7 @@ package org.apache.poi.hssf.record.formula;
 import org.apache.poi.util.LittleEndian;
 public class FuncVarPtg extends AbstractFunctionPtg{
     
-    public final static short sid  = 0x22;
+    public final static byte sid  = 0x22;
     
  /**Creates new function pointer from a byte array 
      * usually called while reading an excel file. 
diff --git a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
index 3df425ae1..9c91baeea 100644
--- a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
@@ -68,7 +68,7 @@ import org.apache.poi.hssf.util.RangeAddress;
  */
 
 public class Ref3DPtg extends Ptg {
-    public final static short sid  = 0x3a;
+    public final static byte sid  = 0x3a;
     private final static int  SIZE = 7; // 6 + 1 for Ptg
     private short             field_1_index_extern_sheet;
     private short             field_2_row;
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
index a9e25bc11..38ecce414 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
@@ -71,7 +71,7 @@ public class TestSCLRecord
         extends TestCase
 {
     byte[] data = new byte[] {
-      (short)0x3,(short)0x0,(short)0x4,(short)0x0
+      (byte)0x3,(byte)0x0,(byte)0x4,(byte)0x0
     };
 
     public TestSCLRecord(String name)