Fix based on comments and fix for PUT error in Bridge client.