Cupe minor fixes