fixed warning messages on activation due to nothing being in smof_data
Merge branch 'upstream-fix-warnings' into chad