Quickly fix some bugs