Few code fixes and tweaks for scrutinizer