Replaced some types with fixed size types