Secondary fixes

I don't know what these do, but Ryan does.