Small fixes for sample app