Additional changes base on code reviews