Minor fixes and tweaks