more MonadFail/fail fixes