Working through static code warnings