Fix shim errors