Trying to fix the annoying errors.