various adjustments to get app/tests running