some fixes

some little fixes