Compiling errors fix, partly