Fixes various b2g desktop breakages...