Fixed token issues for osx