More time change fixes