Small changes to get app running