OpenFL 2.1 fixes
Merge pull request #1306 from jgranick/dev

OpenFL 2.1 fixes