Bug fixes from hackathon

This is a simple bug, maybe you want to merge before opening new PRs, or pylint will keep failing. Sorry I didn't realize this before.