Fix dependencies to work in Safari, etc