CICE restart bug fixes