More sandbox fixes.