Format comment
Add FIXME comments for Operator-pending mappings