More changes to bring up to date with master.
0.1.1