[++][FIX][ActivityTracker] Minor fixes