Got the corrected timezone mapping working.