Some minor changes to networking etc