Template and config fix