Fixing defaults