 I'll get a merge request created with all these tedious bugfixes so we don't need to go back and forth.