Bug fixes for v1.7.2