Add FIXME comments to point out code issues