Fix some line-length and redefinition warnings from pylint