Sober up fixes