Removed some compiling errors