tweaks towards getting a clean compile on both Linux and Darwin