Minor fixes for profile display
Merge remote-tracking branch 'upstream/master'