Bug fixes, missing urls