Various smaller corrections
Small corrections to url generation