Fixed timezone offset issues