Shield fixes