Fixes for mark, update to phase 2