Fixes / improvements to Sandbox