Kat & TPB last fixes