more changes from 1.8.7