Fix issues and improvements from first release

Merge request reports

Loading