run code analysis, fix errors
run code analysis, fix errors

original commit: vintage-software/vstack@eef6f5528c1f099fc3257f960f94c01052028b76

split from 5a3ae73e956087a59d61a68997685826ecf99414

vintage-software/vstack