More sensible defaults based on our use case.
Merging in from headless state.