Homeswift

Fix compiler and linter warnings

Authored by msutcliffe on May 27 2020, 2:37 PM.