Misc fixes and stuff.