Slightly better URL handling