Further improve XIM init