beta bug fixes