Update setup with some minor fixes found when using setup

Merge request reports