Fixed URL and some other stuff