Fix/underscore errors

Fix the error due to missing templates.