Cleanups and fixes

Random things I found while hand testing etcd. I have more work to do but lets start here.