tiny changes to primitive types support