matching option changes in activation script based on Manne's pull request comments