Cleaned up a few OSX 10.10 deprecated functions.