Fix servo support