Build fixes with a newer pylint