Fix a few coding errors that caused compiler warnings.
Fix a few coding errors that caused compiler warnings.

PR:		bin/71615
Submitted by:	Craig Rodrigues (original patch by Dan Lukes)

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase