addressing several "quick fixes" in preparation for 1.9.0