issue and networking fixes