Some stuff to fix some other stuff.