Rahul minor fixes