Fixed additional socket calls