Fixing architecture dependent builds.