Fix HelloWorld issues