build: addressed some code-analysis errors.