Fix B2G viewer