Fix stuff for int fallback removal