Fixed Beta 5 issues.