assorted fixes for 1.6