Some further OS X improvements