Fixes by MacMark