Updates to make the MAST demo work.