Minor fixes

Some minor random fixes found during setup