Fix socket support