FIX 2 errors on templates