Added some FIXMEs for later.

--HG--
extra : rebase_source : a82aef2d5065d03cb0a14f9020f9fcc82fb16f12