UA bug fixes (related to Mac mostly)