Sandbox fixes