tiny fixes in primitives