Minor improvements in the app model.