Mc solver fixes