Fixes for timg changes.