Fixed all the new errors that showed up, according to scrotomizer