Incorporate pre-release changes from Andrew.