API bug workaround and metro icon stuff.