Small changes for JSS