Avoid warnings on master