minor fixes for 7.26