ace nits and warning cleanup
review comments
Merge pull request #3767 from devoncarew/devoncarew_ace_nits

ace nits and warning cleanup