Fixed beta 7 errors.