Fixes based on sample app