Fix more breaks

I'm a b-boy now