More sensible defaults and fix