Added FIXME notes. #1018