Adding and fixing FIXMEs