Updates for errata 1.6