Compile errrors (from last commit) fixed