SwC further fixes