Fixes for Browser view controller related issues in #107 and #108