Even more build system tweaking