Small fixes to comply with Mozilla rules for the Marketplace