Fixed RSF and Gym stuff