Some fixes for template parsing.