Fixes to internal app setup