Update for recent portability improvements