additional upstream compatibility changes (expac)