Work on cleaning up gcc warning
Try again to make gcc happier