Compatibility with 1.7.2, and minor bug fixes