Fixes for data with end dates