minor fixes for 7_1_4_patch1