Quick fix for the start date calculation, this is a complete mess
Fix some invalid data for the plans