Fixes for underscore templates.