Project changes to try and remove build warnings.