Fix activity-monitor and lib/cdo extension