! Updates based on recent 2.06 patch for SMF

Signed-off-by: Spuds <spuds@spudsdesign.com>
Merge pull request #925 from Spuds/206Updates

Updates based on recent 2.06 patch for SMF