Fix all open FIXMEs, clean up