Review changes for #419