Fix up for OctOS lunch combos