more fixes on using machine integers