fixing compiling errors, more on 4.3.4