Fix latest commits