Tweaks fixed

Anand