Trivial fixes to 1.6