[clock, tools] Additional tweaks to timezone getting