Few more minor fixes.