Fix per comments in PR