fixes to get things working on b2g build