Added little fixes