assorted bug fixes for 1.8