#42 Fix defaults for all primitives