Added two FIXMEs that should be checked

These are the FIXMEs notes that were previously in #216. I thought it was better to move them to a separate PR so that we can keep alive the discussion.

review by @skyluc