Various fixes
Fix urls