some portability cleanups