Quick fixes, includes commenting out chrM