Partial fix for update exemptions