Changes to allow na example to run on genesis