Multi-sandbox fixes, still incomplete