More servo support and other changes