Add FIXME messages for merge #141