updates to fix issues found by scrutiziner-ci