Follow up #658 fixes