Tim integration fixes