Bring all in a sane state again...