Beta fixes 1