Added a FIXME comment. Fix a typo in a comment.