Fixed issues mentioned by Abhineet.