Fixed minor thingies.

Now it works! On to remove 1.5.2 cruft from 1.6.2 launching.