S.C. HSBPanel fix, other fine tuning