Missed a few eclipse warnings that I just cleaned up