Improvements and fixes to Appurify integration