Made some more bug fixes, all relating to DST