Disable -Werror on this branch