Fix additional potential issues with Browse