Small fixes for Mac