Additional fixes for the stacked area enter() exit() bugs