Progress on #617 and #618