Portability updates