Moar fixes

For real. Fucking materials.