Added a few FIXMEs