Few more minor fixes