Fix to Templates and Temp Bonus correction