shim fixes from CR