Minor Template Changes