Even more fixes

Holy shit