Some fixes needed to get stuff working for RHEL again

Still need some work to get it working for Windows again…