A first pass of bugfixes from the beta.