Sample App Fixes