Fix pylint errors

Especially argument mismatch introduced in
c7a27de6147d72624de81623638cba93ad65c13a
Fix pylint warnings