Minor fixes and stuff