Misc changes for 0.7.1.