fix some primitives