More fixes and stuff.