Moar fixes to prev commit