Fixes based on staging failure.

FIxing setupapp_db based on issue with 9.2.