fixed additional upstrean compatibility changes (expac)