fix issues prior to PR