Beta candidate build 2, minor bug fixes