Sandbox tweaks