minor fixes for 1.7