Fix build failures & get sample app running again