Fix primitives