Merge pull request #573 from hoosteeno/master

Fix minor bugs found during/after profile launch.