Some url fixes