Stability fixes for the hosting app