Few more fixes and tweaks