Two fixes from Daniel. N3804 final.