Core: Fixed more compiling errors