beta fixes