fix OS X build regressions
fix OS X build regressions

lostdj/avian,dicej/avian,MaartenR/avian,minor-jason/avian,lwahlmeier/avian,getlantern/avian,marcinolawski/avian,bigfatbrowncat/avian-pack.avian,bgould/avian,marcinolawski/avian,getlantern/avian,bgould/avian,joshuawarner32/avian,joshuawarner32/avian,ucdseniordesign/avian,bigfatbrowncat/avian-pack.avian,minor-jason/avian,dicej/avian,dicej/avian,lwahlmeier/avian,bigfatbrowncat/avian-pack.avian,lwahlmeier/avian,bgould/avian,lwahlmeier/avian,MaartenR/avian,joshuawarner32/avian,marcinolawski/avian,ucdseniordesign/avian,dicej/avian,lostdj/avian,bigfatbrowncat/avian-pack.avian,MaartenR/avian,lostdj/avian,joshuawarner32/avian,getlantern/avian,minor-jason/avian,ucdseniordesign/avian,marcinolawski/avian,ucdseniordesign/avian,lostdj/avian,getlantern/avian,minor-jason/avian,MaartenR/avian,bgould/avian