Activation related fixes