Hopefully the last type error fixes