Fix JSM class names
URL handling fixes