Fixed Beta 4 compilation issues.