Fixes, windows, and osx stub