Progress on #734 and #735