Some little fixes, #3
Some little fixes , #3