Rename a function
Silence a couple integer comparison warnings