Make it all work on B2G