Integer cleanup

Changes from compiling with additional -W options
:+1: good catch