Fixes for template precompilation after refactor.