Few more minor changes commit