Fix more hardcoded url lengths