Fix latest remote changes