[FIX] A few bits I forgot