Forgot some stuff

I forgot to add some of the fixes in the previous commit