Fixing the defaults