Updates to core & sandbox