Fixed thingsss