Prevent CastClassException error on Byte -> Int

Was previously getting issues propigating constants that where
of type Byte. Just needed to properly cast the type to Byte
and use the .intValue function. Also changed the Short even
though it wasn't directly failing, incase this case is the same.