Some little fixes
Some little fixes