Url fixes
Fixing some little bugs