minor portability enhancements