Tweaks to make core context work on OS X

Core context seems to be up and running now..