fix types to have guaranteed size