Minor fixes changes after review