Fixed compiling problems under IDE 1.5.8