fix variable names in sig handlers