Use more quoting in activate and deactivate