Fix primitive types