Readd some stuff from accedental removal.