Fixing default variables