more fixes to the use of builtin machine integers