Fixes for ViewController based HelloWorld sample.