General changes

Fixes on some urls