Minor fixups after repository move