Few trivial changes