More fixes to servo build