Fixed a bunch of FIXMEs