Fixed code changes implied by beta 20