Fix some more DST issues