libpayload: Improve compatibility