FIXME messages fixed