do some fixes
some fixes