Fixed issues suggested by Ankit