Status and template fixes