Translations and minor fixes
Removed forced compilation of template