Fix Quest and Shop