Few fixes and another post