make fixes stated in PR