Patches from build system added.