A few build system related simplifications