Fixed various template refs.