even more URL fixings