Even more enter key fixes.
More enter key fixes