Minor fixes and tweaks ;)