fixes to PR