Fixed some local time related issues