More int/float fallback removal fixes