Integer cleanup

Changes from compiling with additional -W options
Another good catch!