Moar issues fixed