Also has some other fixes, but with how much other stuff is going on here…
Cc: @christos.tsolakis @berkgeveci