Latest build system changes