Some cleanups for Mac and Linux

Signed-off-by: Geoff Lane <geoff@zorched.net>