Few proposals from @hemanth

//cc