Few proposals from @hemanth

Two proposals.