Fix a couple ExpInt bugs, but still not stable.