Fix 3 instances of "TypeError: __init__() takes exactly 1 argument (5
given)"

Fixes GH-18