Some work on #446, #447, #448