Anshul: Fixed compilation issues