Working on popover and modal bug fix.

No bug in dev, but bug appears after build.