Several repowise code health fixes