Get project running again, fix up blaze templating issues