Fixes on urls