Some more URL fixes. See #158