Database and Networking Fixes