Misc

Just some small stuff I stumbled upon while trying to setup a development instance. :wink: