Fixes for tmp add