More servo changes