various fixes from pylint