Make next, last time zone aware