fixes for upgrade to 1.8