Add a few more defaults.