Fix #385 template assignment and TVs