Fixed small things which made Magma take much longer than needed.