Minor fixes to make PyLint a little happier.