Few fix and more message