Sample App 3.0 fixes