Cleaning up some more warnings; mostly just numeric.