Few more minor fixes 2