Fix more stuff

Last commit didn't get everything