Fixed some Issues on Remote Site