fixes for new tammm