[IM] Fixes and improvements from live