Fixed More Compile Errors