Get some stuff working after refactoring.