NEw little fixes
NEw little fixes