Pan automation/serialization fixes.