Fix more python 3 incompatibilities

Signed-off-by: Justin Lecher <jlec@gentoo.org>