First pass at OS X Compatibility