More smokeping changes.