Fixing WC3 errors