Fixes for JSS