Bug fixes from SMTDDR