Numerous url fixes