Add better defaults.