BrowserContext: fix CS issues