add fixes to minimize changes introduced by !241
Passed
Frederik Schwan
created pipeline for commit
b1220323
, finished
For master
42 seconds, queued for 3 seconds