Further fixes for single app rep submission