Changed ACTIVATION_DEADLINE to ACTIVATION_PERIOD, and minor related fixes.