Some more fixes for beta

Merge request reports

Loading