Fixes for the date