Pull request remarks fixes