Fix Csfd and Track plugins