Some minor fixes + removal of signals from .swc