Finished fixes and cleanup to Connect and Realtime.