OPM-139: Fixed issues after review