Fix a few things up. I guess I left this in kind of a broken state.