Small bug fixes with connection and save logic