Fix FIXMEs

Added in commit 51b757d5c891c01ff6041e5a86511b3976a50d3c.