Fix develop-specific pylint errors