Fix date/location