Patch some bugs in previous update