Fixes in profile & other bugs