Changes to make things compile on OSX 10.10 --- not a fan