Some changes in preparation for cross-compilation.