Legend fix and fixed date/time hack