(Test/)Profile minor changes