even moar fixes