WIP: Nejc bugfixes

Jani Bizjakrequested to merge
nejc_bugfixes into master

Merge request reports