Fixed URL issues