Mac related updates