More fixes

This indentation makes pylint cry :(