Fixed Area and schedule issues