some fixes

some fixes