More fixes

Bleh github gleeehhhhbleh bleh