SwC bug fixing attempts