Fix bugs with actor, servo code, etc