some little fixes