Fix lastest commits