Add bind shim for headless browsers and some tweaks