Updates for Mirage portability