Tim integration fixes rev2