Few little fixes