Improving not resolved error messages
Removing duplicate template bug