Fixes to build on Macs.

Change-Id: Ie12de1a7acd5f1229cb563dc220267dbbb1ab583
Merge topic 'nektar_reader_plugin' into next

c383033 Fixes to build on Macs.