Variuous fixes for the beta