Also, make sure you select the right form.
After you start into the 1099-R entry area, I'm pretty sure your form (from OPM) is either a CSA-1099-R (OR CSF-1099-R for a surviving spouse). Make sure you've chosen the correct sub-form type...i.e. I suspect, not a regular 1099-R.
Now a TSP distribution? That would be a regular 1099-R.