More work on #235 and #452