Improve fixme comments