Making default settings work a little better