Fix up inverting on manta and clean up base inversion