! Updates based on recent 2.06 patch for SMF

Signed-off-by: Spuds <spuds@spudsdesign.com>