NOREF: Cleaning up some errata