Couple of beta fixes