Fixed issues raised in PR