 - Fixes for NaCL and Apple, hopefully everyone will be happy
 - Fixes for NaCL and Apple, hopefully everyone will be happy

hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie