Fix stuff broken by GitHub