Reverted to actual bit length in type definitions