Fix unit failures