initial beta fixes