Update to 1.6 and fix a few things.