Activation fixes