Fixes to activation end time