More sensible defaults...