Fixed minor issues in a templates