Fix link errors on OSX 10.9?  I think?

Fix for #1008