A few more changes per external user suggestions