Fix busted build

Got too quick with pushing things and pushed some stuff that didn't compile
after a refactor.