Fixes to those changes

I fixed it!