Fixed more types -- ready for formatting