Even moar fixes