Few more trivial changes