fix profile related issues