Portability enhancements