Minor updates for URL fixing..