Fix shielding issues