master template fixes