Some tweaks to generator defaults