Fix handling of epoch times