Fix for the compile errs