Outstanding changes in smokeping codebase from ptinsley