Fix the getUrl calls, and some others.