Amendments after PR comments