Final fixes for 32/64bit integer goofups.