Changes according to pr/745 review comments