Fixed things destroyed during refactoring.