fixes for changes in 1.8.0