Re-push for app errors fixes