Fixes more url issues