More fixes because this stupid thing is being an asshole :D