Small cleanup and possible bugfix in Profile