Minor adjustments to network stack