Small fixes for Mac version