More PAX fixes