The first fixes. Will continue later.