Fixing WC3 errors. #26