More fixes! :(