diff --git a/spacy/_theano.pyx b/spacy/_theano.pyx
index b791c4f42..965ee84d7 100644
--- a/spacy/_theano.pyx
+++ b/spacy/_theano.pyx
@@ -28,7 +28,7 @@ cdef class TheanoModel(Model):
         self.model_loc = model_loc
         
     def predict(self, Example eg):
-        self.input_layer.fill(eg.embeddings, eg.atoms)
+        self.input_layer.fill(eg.embeddings, eg.atoms, use_avg=True)
         theano_scores = self.predict_func(eg.embeddings)[0]
         cdef int i
         for i in range(self.n_classes):
@@ -37,7 +37,7 @@ cdef class TheanoModel(Model):
                                    self.n_classes)
 
     def train(self, Example eg):
-        self.input_layer.fill(eg.embeddings, eg.atoms)
+        self.input_layer.fill(eg.embeddings, eg.atoms, use_avg=False)
         theano_scores, update, y = self.train_func(eg.embeddings, eg.costs, self.eta)
         self.input_layer.update(update, eg.atoms, self.t, self.eta, self.mu)
         for i in range(self.n_classes):
diff --git a/spacy/syntax/parser.pyx b/spacy/syntax/parser.pyx
index 66d598b88..797ee1e56 100644
--- a/spacy/syntax/parser.pyx
+++ b/spacy/syntax/parser.pyx
@@ -53,7 +53,7 @@ def get_templates(name):
     elif name == 'debug':
         return pf.unigrams
     elif name.startswith('embed'):
-        return ((10, pf.words), (10, pf.tags), (10, pf.labels))
+        return (pf.words, pf.tags, pf.labels)
     else:
         return (pf.unigrams + pf.s0_n0 + pf.s1_n0 + pf.s1_s0 + pf.s0_n1 + pf.n0_n1 + \
                 pf.tree_shape + pf.trigrams)