Fix errata noticed by Eric