typo fix & 4.7 toolchain compile error fix