Offline cupe fixes