Fixes regarding comments in PR.