Fix bugs for browser binding