Added important FIXMEs