Minor fixes so that networking works again