More fixes, yay!