More fixes YA I get to rebase like a mofo later!