Tanmay fixes