Fixed bad URL problems