More SMF additions and fixes.