FIX: 32 bit shift warnings