Minor fixes and stuff.