Fixed some OSX compilation problems?