fix a little problems

tested on version 2.2.3 and fix a little problems