Few minor fixes 2