Several fixes from reviewers comments