some little fixes
some little fixes