Few more minor updates