Bunch of fixes

Mateusz Żebrakrequested to merge
mzebrak/fixes into develop

Reviewers: @kmochocki @jziebinski

Edited by Mateusz Żebrak

Merge request reports