Fix #241 #242, Resolve static analysis warnings

[skliper]

Checklist (Please check before submitting)

• [x] I reviewed the Contributing Guide.
• [x] I signed and emailed the appropriate Contributor License agreement to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

Describe the contribution

• Fix #241
• Fix #242

Testing performed CI + static analysis run

Expected behavior changes None, just squashes static analysis warnings

System(s) tested on

• Hardware: VM
• OS: Ubuntu 18.04
• Versions: Bundle main + apps + related static analysis resolution branches

Additional context None

Third party code None

Contributor Info - All information REQUIRED for consideration of pull request Jacob Hageman - NASA/GSFC

[astrogeco]

CCB:2022-05-18 APPROVED

[skliper]

Resolved conflicts and rebased on main, ready to merge (assuming CI passes).