Fix sandboxes