Fixing tz issues