Add Sig's stackforge changes here.