Add more sensible defaults