Moar fixes after merge