Minor Template changes