More shim changes