Sandbox improvements