more URL fixes