Fix the defaults