Multiple fixes mostly in template-populated objects