Add FIXMEs for discussion