Improve migemo handling