Wip fixes

Some very minor fixes, it was kind of hard to do a review without a place to put comments so I thought it was better to fix these that are minor.

As a side note, it looks like there are a few `except Exception` that are not using `log.exception` helpers. Most of the code does in fact use that, but there are a few that do not.

From glancing over it looks good!