Sample App Fixes 06/25 Release