minor fixes for 2.067