Fixed up URL issues