minor refactoring in SCB
Fix NPE in compiling GSPs