fixes for profiles merge