Fix some Profile related issues