Moar fixes
Even moar fixes