Fixed some remaining half finished things after the latest refactoring.