Rush improvement back down to master before CF

Rushes changes preventing build & improving matching errors back to master before the code freeze.

@Olink if you're fine with this, just go ahead and merge it asap.