Code fixes based on Review comments by Anil.