manager-side fixes