Various api/library modernisations to make the app work when checked out