Minor fixes and tweaks here and there