Try to fix compiling errors