Some minor fixes, due to pylint being mean to me