Fixed issues on Mac. (#29)