Add some sensible defaults