Fixes various Aero drawing issues
Merge pull request #445 from adobe/jeff/fix_aero_9

Fixes various Aero drawing issues