Fixes for BrowserCMS 3.5.x