Minor fixes so helloworld mostly still works