post beta-7 fixes