Activation fixes - GUI