Few fixes from previous update