Fixes for Linux and MAC.