Private beta fixes 1