More work on jspc updates