Fix a couple of things:
I tested these issues with Paul and rolled them out on the actual console on 2018-01-17 (also made a tag).