Miscellaneous changes to bring public repo in line with private

This consists mostly of commits I somehow skipped over and didn't patch
into the public repo