Fix more bugs in !2052

Edited by Rasmus Munk Larsen

Merge request reports

Loading