More PR comments addressed