Quick changes to enable osx mavericks compilation