Changes needed to get sample app to compile