Update to fix issues for mobile devices

Also fixed issue for special case of January 1