Fix couple of pylint warnings

This should not change behavior.

Change-Id: Ia10ed3fc8e3546e5686b4a1440fc993c0fbfb175