New fixes for CUP update.