Minor refactor to get app to run properly on the Aerobatic host.