Applies changes for errata as discussed in Apr 14 meeting