Fixes for preprocessor changes.
Updated linux target.