Fixed WC3 errors