Some fix to the app