Fixed bugs from server upgrade.