Minor fixes

A few changes I’ve had sitting around. Cleaning up post re-fork.