Fix issues in "make profile"