Beta fixes