Mirage 1.1 fixes more