Yangzhou - Fix Bugs