minor fixes for 25.