Committed the rest of the Magma changes