Update to make the app run with recent API and 3rd-party libs

Only partially works.