uh, seem to have skipped a few files w/ the portability change