Clean up fixes
TYNSTEP-916