Track a few more CM packages...