Updates to source code to fix SA warnings.