Fixed all problems caused by Beta3 upgrade.