Updates to remove all warnings from code scan and compile