Closer to fixing TT entry bug.
More mods to handle mac.