Two fixes for the server converge.
Bump version for dev.