Add fixes from browser-sync-client lib