249 Beta fixes and other minor stuff