Mac client fix and minor things