Fix errors pointed by pylint. Result of bad merge.