Fix more urls not to depend on WP. Continued fix for #632.