Fixed remote bugs