Fixes for template hierarchy