Fixes for last commit; version is now 1.10.0.