Fix remaining int variables, #82