Fixes for B2G
Fixes for B2G