Fixed major errors introduced in a22a5c50

Note to myself: Only merge after making sure that i didn't break the whole app...

Merge request reports

Loading