Misc fixes

cc @cory

Merge request reports

Loading