Fix all of the stuff that broke during the big refactoring...